tree-wide: Add+run spatch to use glnx_throw()

I had to run a sed job to add whitespace after, but otherwise this was easy.

Closes: #890
Approved by: jlebon

diff --git a/coccinelle/new-error.cocci b/coccinelle/new-error.cocci
new file mode 100644 (file)
index 0000000..147a8e0
--- /dev/null
+++ b/coccinelle/new-error.cocci
@@ -0,0 +1,19 @@
+// Conversion for G_IO_ERROR_FAILED that could be glnx_throw()
+@@
+expression p;
+@@
+- g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, p);
+- return FALSE;
++ return glnx_throw (error, "%s", p);
+@@
+expression p;
+@@
+- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, p);
+- return FALSE;
++ return glnx_throw (error, p);
+@@
+expression p, q;
+@@
+- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, p, q);
+- return FALSE;
++ return glnx_throw (error, p, q);

diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c
index 7d2ed3c66b949ef018220b91203ce3fdce894a36..54e01bcb63f236513294a1e4b13c9a015e6c9a1b 100644 (file)
--- a/src/libostree/ostree-core.c
+++ b/src/libostree/ostree-core.c
@@ -1763,16 +1763,12 @@ validate_variant (GVariant           *variant,
 {
   if (!g_variant_is_normal_form (variant))
     {
-      g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                           "Not normal form");
-      return FALSE;
+      return glnx_throw (error, "%s", "Not normal form");
     }
   if (!g_variant_is_of_type (variant, variant_type))
     {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Doesn't match variant type '%s'",
-                   (char*)variant_type);
-      return FALSE;
+      return glnx_throw (error, "Doesn't match variant type '%s'",
+                        (char *)variant_type);
     }
   return TRUE;
 }

diff --git a/src/libostree/ostree-gpg-verify-result.c b/src/libostree/ostree-gpg-verify-result.c
index cd709b7c41199451da3992208fc7a40c58840e22..0277ce1e1202a3c757c7c37910e504eb53499f12 100644 (file)
--- a/src/libostree/ostree-gpg-verify-result.c
+++ b/src/libostree/ostree-gpg-verify-result.c
@@ -665,9 +665,8 @@ ostree_gpg_verify_result_require_valid_signature (OstreeGpgVerifyResult *result,
 
   if (ostree_gpg_verify_result_count_valid (result) == 0)
     {
-      g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                           "GPG signatures found, but none are in trusted keyring");
-      return FALSE;
+      return glnx_throw (error, "%s",
+                        "GPG signatures found, but none are in trusted keyring");
     }
 
   return TRUE;

diff --git a/src/libostree/ostree-repo-libarchive.c b/src/libostree/ostree-repo-libarchive.c
index 0198289418757dacc7414e0b712302a5661523a3..02f1364ebfe7d841f47a0c940999f7bb0334be67 100644 (file)
--- a/src/libostree/ostree-repo-libarchive.c
+++ b/src/libostree/ostree-repo-libarchive.c
@@ -640,9 +640,8 @@ aic_handle_entry (OstreeRepoArchiveImportContext *ctx,
         return TRUE;
       else
         {
-          g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                       "Unsupported file type for path \"%s\"", path);
-          return FALSE;
+          return glnx_throw (error, "Unsupported file type for path \"%s\"",
+                            path);
         }
     }
 }

diff --git a/src/libostree/ostree-repo-static-delta-core.c b/src/libostree/ostree-repo-static-delta-core.c
index 3a14f8bb1f05dff17543c2f306d7b6c7f11ac176..d83b7f0f400f17b5d2f3fecb2fae857fbf854145 100644 (file)
--- a/src/libostree/ostree-repo-static-delta-core.c
+++ b/src/libostree/ostree-repo-static-delta-core.c
@@ -45,9 +45,8 @@ _ostree_static_delta_parse_checksum_array (GVariant      *array,
   if (G_UNLIKELY(n > (G_MAXUINT32/OSTREE_STATIC_DELTA_OBJTYPE_CSUM_LEN) ||
                  (n_checksums * OSTREE_STATIC_DELTA_OBJTYPE_CSUM_LEN) != n))
     {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Invalid checksum array length %" G_GSIZE_FORMAT, n);
-      return FALSE;
+      return glnx_throw (error,
+                        "Invalid checksum array length %" G_GSIZE_FORMAT, n);
     }
 
   *out_checksums_array = (gpointer)g_variant_get_data (array);

diff --git a/src/libostree/ostree-repo-static-delta-processing.c b/src/libostree/ostree-repo-static-delta-processing.c
index a71e070fb32bbe8a37ddefcaab8906e08512dac5..2280dec9445d78bc3871e5fbe64f13d1b732c9b0 100644 (file)
--- a/src/libostree/ostree-repo-static-delta-processing.c
+++ b/src/libostree/ostree-repo-static-delta-processing.c
@@ -115,9 +115,7 @@ read_varuint64 (StaticDeltaExecutionState  *state,
   gsize bytes_read;
   if (!_ostree_read_varuint64 (state->opdata, state->oplen, out_value, &bytes_read))
     {
-      g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                           "Unexpected EOF reading varint");
-      return FALSE;
+      return glnx_throw (error, "%s", "Unexpected EOF reading varint");
     }
   state->opdata += bytes_read;
   state->oplen -= bytes_read;

diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index 2b45e6dac62eff1c45d57802f060888ed92fc339..ed4831c18f5c6a85427c9c2465aa7392fbf7e42b 100644 (file)
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -1028,9 +1028,9 @@ checksum_from_kernel_src (const char   *name,
   const char *last_dash = strrchr (name, '-');
   if (!last_dash)
     {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Malformed kernel/initramfs name '%s', missing '-'", name);
-      return FALSE;
+      return glnx_throw (error,
+                        "Malformed kernel/initramfs name '%s', missing '-'",
+                        name);
     }
   *out_checksum = g_strdup (last_dash + 1);
   return TRUE;

diff --git a/src/libotutil/ot-tool-util.c b/src/libotutil/ot-tool-util.c
index 1043f55f9cbc9f653694e5282f372e79cadffd58..0743c5282ad96988c97d96f25494d4849b19a395 100644 (file)
--- a/src/libotutil/ot-tool-util.c
+++ b/src/libotutil/ot-tool-util.c
@@ -40,9 +40,7 @@ ot_parse_boolean (const char  *value,
     *out_parsed = FALSE;
   else
     {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Invalid boolean argument '%s'", value);
-      return FALSE;
+      return glnx_throw (error, "Invalid boolean argument '%s'", value);
     }
 
   return TRUE;
@@ -57,9 +55,7 @@ ot_parse_keyvalue (const char  *keyvalue,
   const char *eq = strchr (keyvalue, '=');
   if (!eq)
     {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Missing '=' in KEY=VALUE for --set");
-      return FALSE;
+      return glnx_throw (error, "Missing '=' in KEY=VALUE for --set");
     }
   *out_key = g_strndup (keyvalue, eq - keyvalue);
   *out_value = g_strdup (eq + 1);

diff --git a/src/libotutil/ot-unix-utils.c b/src/libotutil/ot-unix-utils.c
index 46dd346e3c7ca1dc42f2b03ad8c56f937fb796c0..54547dd995249d14dc35739a3f3a740d1c01ac34 100644 (file)
--- a/src/libotutil/ot-unix-utils.c
+++ b/src/libotutil/ot-unix-utils.c
@@ -41,21 +41,15 @@ ot_util_filename_validate (const char *name,
 {
   if (strcmp (name, ".") == 0)
     {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Invalid self-referential filename '.'");
-      return FALSE;
+      return glnx_throw (error, "Invalid self-referential filename '.'");
     }
   if (strcmp (name, "..") == 0)
     {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Invalid path uplink filename '..'");
-      return FALSE;
+      return glnx_throw (error, "Invalid path uplink filename '..'");
     }
   if (strchr (name, '/') != NULL)
     {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Invalid / in filename %s", name);
-      return FALSE;
+      return glnx_throw (error, "Invalid / in filename %s", name);
     }
   return TRUE;
 }

diff --git a/src/ostree/ot-builtin-commit.c b/src/ostree/ot-builtin-commit.c
index 4b0d88219c632a797e5a29bf621e10205d7663ad..c14cbec5635c33e7487299da3ae4293700b801a2 100644 (file)
--- a/src/ostree/ot-builtin-commit.c
+++ b/src/ostree/ot-builtin-commit.c
@@ -147,9 +147,7 @@ handle_statoverride_line (const char  *line,
   spc = strchr (line, ' ');
   if (spc == NULL)
     {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Malformed statoverride file (no space found)");
-      return FALSE;
+      return glnx_throw (error, "Malformed statoverride file (no space found)");
     }
 
   mode_add = (guint32)(gint32)g_ascii_strtod (line, NULL);

diff --git a/src/ostree/ot-builtin-config.c b/src/ostree/ot-builtin-config.c
index 0d8f7b77b0b4cf7850521a759a9a8e176bfb4a23..a9a5f52a9635c644def1186d007b37a139fa9df9 100644 (file)
--- a/src/ostree/ot-builtin-config.c
+++ b/src/ostree/ot-builtin-config.c
@@ -41,9 +41,8 @@ split_key_string (const char   *k,
   
   if (!dot)
     {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Key must be of the form \"sectionname.keyname\"");
-      return FALSE;
+      return glnx_throw (error,
+                        "Key must be of the form \"sectionname.keyname\"");
     }
 
   *out_section = g_strndup (k, dot - k);